Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 11189fc2d48cb7d2282f7a673e7dea088004327f..74468560362204d96dfa3d2578d371216033c8ff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
        * casetab.c (shuffle): Fix the logic of setting up the cycle.